merge with xen-unstable.hg
authorHollis Blanchard <hollisb@us.ibm.com>
Thu, 2 Aug 2007 14:54:18 +0000 (09:54 -0500)
committerHollis Blanchard <hollisb@us.ibm.com>
Thu, 2 Aug 2007 14:54:18 +0000 (09:54 -0500)

Trivial merge